css: Move enum

I want to use it for a gadget, so it's better in the generic file.

diff --git a/gtk/gtkcssimagebuiltinprivate.h b/gtk/gtkcssimagebuiltinprivate.h
index 8bbdf4d88abd860f4531899d20f4d342f1bbf95d..9ed8a542c9df9a2c191e2ccffe441b8b307afe8d 100644 (file)
--- a/gtk/gtkcssimagebuiltinprivate.h
+++ b/gtk/gtkcssimagebuiltinprivate.h
@@ -25,39 +25,6 @@
 
 G_BEGIN_DECLS
 
-typedef enum {
-  GTK_CSS_IMAGE_BUILTIN_NONE,
-  GTK_CSS_IMAGE_BUILTIN_CHECK,
-  GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
-  GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
-  GTK_CSS_IMAGE_BUILTIN_OPTION,
-  GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
-  GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_UP,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPLEFT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_TOP,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPRIGHT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_RIGHT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMRIGHT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOM,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMLEFT,
-  GTK_CSS_IMAGE_BUILTIN_GRIP_LEFT,
-  GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR,
-  GTK_CSS_IMAGE_BUILTIN_HANDLE,
-  GTK_CSS_IMAGE_BUILTIN_SPINNER
-} GtkCssImageBuiltinType;
-
 #define GTK_TYPE_CSS_IMAGE_BUILTIN           (gtk_css_image_builtin_get_type ())
 #define GTK_CSS_IMAGE_BUILTIN(obj)           (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_CSS_IMAGE_BUILTIN, GtkCssImageBuiltin))
 #define GTK_CSS_IMAGE_BUILTIN_CLASS(cls)     (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_CSS_IMAGE_BUILTIN, GtkCssImageBuiltinClass))

diff --git a/gtk/gtkcsstypesprivate.h b/gtk/gtkcsstypesprivate.h
index 1896bfe4af00dd5e2c8c2b7b7cffb541a5b59c81..1660db8536dca01357bb522297f8cb065c1b8e79 100644 (file)
--- a/gtk/gtkcsstypesprivate.h
+++ b/gtk/gtkcsstypesprivate.h
@@ -226,6 +226,39 @@ enum { /*< skip >*/
   GTK_CSS_PROPERTY_N_PROPERTIES
 };
 
+typedef enum /*< skip >*/ {
+  GTK_CSS_IMAGE_BUILTIN_NONE,
+  GTK_CSS_IMAGE_BUILTIN_CHECK,
+  GTK_CSS_IMAGE_BUILTIN_CHECK_CHECKED,
+  GTK_CSS_IMAGE_BUILTIN_CHECK_INCONSISTENT,
+  GTK_CSS_IMAGE_BUILTIN_OPTION,
+  GTK_CSS_IMAGE_BUILTIN_OPTION_CHECKED,
+  GTK_CSS_IMAGE_BUILTIN_OPTION_INCONSISTENT,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_UP,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_DOWN,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_ARROW_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_LEFT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_LEFT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_HORIZONTAL_RIGHT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_EXPANDER_VERTICAL_RIGHT_EXPANDED,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPLEFT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_TOP,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_TOPRIGHT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_RIGHT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMRIGHT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOM,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_BOTTOMLEFT,
+  GTK_CSS_IMAGE_BUILTIN_GRIP_LEFT,
+  GTK_CSS_IMAGE_BUILTIN_PANE_SEPARATOR,
+  GTK_CSS_IMAGE_BUILTIN_HANDLE,
+  GTK_CSS_IMAGE_BUILTIN_SPINNER
+} GtkCssImageBuiltinType;
+
 typedef enum /*< skip >*/ {
   GTK_CSS_AREA_BORDER_BOX,
   GTK_CSS_AREA_PADDING_BOX,

diff --git a/gtk/gtkrendericon.c b/gtk/gtkrendericon.c
index 081b660014daab94856eeba82cf3f2ede2161bea..411050a6b5ca1b7760c52e9a243c8be427a13e58 100644 (file)
--- a/gtk/gtkrendericon.c
+++ b/gtk/gtkrendericon.c
@@ -21,6 +21,7 @@
 
 #include "gtkrendericonprivate.h"
 
+#include "gtkcssimagebuiltinprivate.h"
 #include "gtkcssimagevalueprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
 #include "gtkcssstyleprivate.h"

diff --git a/gtk/gtkrendericonprivate.h b/gtk/gtkrendericonprivate.h
index f006e97105aa251a88339dfe62dcaa42d425b83d..a92735a96aa96c5cf835af52ac26400a00324548 100644 (file)
--- a/gtk/gtkrendericonprivate.h
+++ b/gtk/gtkrendericonprivate.h
@@ -24,7 +24,6 @@
 #include <cairo.h>
 
 #include "gtkcsstypesprivate.h"
-#include "gtkcssimagebuiltinprivate.h"
 #include "gtktypes.h"
 
 G_BEGIN_DECLS